apply fix to #58420 from Hidetoshi Tajima and Matthias Clasen

2001-08-30  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix
	to #58420 from Hidetoshi Tajima and Matthias Clasen

diff --git a/ChangeLog b/ChangeLog
index 425b1d3c378057fed6cf4f9fe8deeef762feb4c4..e163aab2eba8d0ddf973864e573cdf85abd42b4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-30  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix
+       to #58420 from Hidetoshi Tajima and Matthias Clasen
+
 Wed Aug 29 17:28:04 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 425b1d3c378057fed6cf4f9fe8deeef762feb4c4..e163aab2eba8d0ddf973864e573cdf85abd42b4e 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-08-30  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix
+       to #58420 from Hidetoshi Tajima and Matthias Clasen
+
 Wed Aug 29 17:28:04 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 425b1d3c378057fed6cf4f9fe8deeef762feb4c4..e163aab2eba8d0ddf973864e573cdf85abd42b4e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-08-30  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix
+       to #58420 from Hidetoshi Tajima and Matthias Clasen
+
 Wed Aug 29 17:28:04 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 425b1d3c378057fed6cf4f9fe8deeef762feb4c4..e163aab2eba8d0ddf973864e573cdf85abd42b4e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-08-30  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix
+       to #58420 from Hidetoshi Tajima and Matthias Clasen
+
 Wed Aug 29 17:28:04 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 425b1d3c378057fed6cf4f9fe8deeef762feb4c4..e163aab2eba8d0ddf973864e573cdf85abd42b4e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-08-30  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix
+       to #58420 from Hidetoshi Tajima and Matthias Clasen
+
 Wed Aug 29 17:28:04 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 425b1d3c378057fed6cf4f9fe8deeef762feb4c4..e163aab2eba8d0ddf973864e573cdf85abd42b4e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-08-30  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix
+       to #58420 from Hidetoshi Tajima and Matthias Clasen
+
 Wed Aug 29 17:28:04 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 425b1d3c378057fed6cf4f9fe8deeef762feb4c4..e163aab2eba8d0ddf973864e573cdf85abd42b4e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-08-30  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix
+       to #58420 from Hidetoshi Tajima and Matthias Clasen
+
 Wed Aug 29 17:28:04 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index ac2f00a2ef41a6f8491ce614b0fd8d762da80fac..486ca82f8012b344bc65ad9145a6c0a780f04c16 100644 (file)
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -2345,14 +2345,6 @@ fundamental type.
 @window: 
 @Returns: 
 
-<!-- ##### FUNCTION gtk_window_get_resizeable ##### -->
-<para>
-
-</para>
-
-@window: 
-@Returns: 
-
 <!-- ##### FUNCTION gtk_window_set_decorations_hint ##### -->
 <para>
 
@@ -2369,11 +2361,3 @@ fundamental type.
 @window: 
 @functions: 
 
-<!-- ##### FUNCTION gtk_window_set_resizeable ##### -->
-<para>
-
-</para>
-
-@window: 
-@resizeable: 
-

diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml
index 9d4e531e7a497eaaaaf249306c56380d748f7643..29e75e743a374c56ce2a0e42ecf4fccd162c78a9 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenu.sgml
@@ -96,9 +96,9 @@ Creates a new #GtkMenu.
 Adds a new #GtkMenuItem to the end of the menu's item list.
 </para>
 
+<!-- # Unused Parameters # -->
 @menu: a #GtkMenu.
 @child: The #GtkMenuItem to add.
-<!-- # Unused Parameters # -->
 @m: 
 @c: 
 
@@ -108,8 +108,8 @@ Adds a new #GtkMenuItem to the end of the menu's item list.
 Adds a new #GtkMenuItem to the beginning of the menu's item list.
 </para>
 
-@menu_child: 
 <!-- # Unused Parameters # -->
+@menu_child: 
 @m: 
 @c: 
 @menu: a #GtkMenu.
@@ -122,10 +122,10 @@ Adds a new #GtkMenuItem to the menu's item list at the position
 indicated by @position. 
 </para>
 
+<!-- # Unused Parameters # -->
 @menu: a #GtkMenu.
 @child: The #GtkMenuItem to add.
 @pos: 
-<!-- # Unused Parameters # -->
 @position: The position in the item list where @child is added.
 Positions are numbered from 0 to n-1.
 

diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml
index b601a6e9bd154915d3d57ede3f29b28eaeac4b4c..6e38db29a0ea14323ded8458df9d9c16260361e7 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkwindow.sgml
+++ b/docs/reference/gtk/tmpl/gtkwindow.sgml
@@ -128,6 +128,26 @@ the child gets a larger allocation than it requests.
 it's larger
 
 
+<!-- ##### FUNCTION gtk_window_set_resizeable ##### -->
+<para>
+
+</para>
+
+@window: 
+@setting: 
+<!-- # Unused Parameters # -->
+@resizeable: 
+
+
+<!-- ##### FUNCTION gtk_window_get_resizeable ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_window_add_accel_group ##### -->
 <para>
 

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 9b413bbe91ba70f59c22784faa8f575b896d2903..71429dc3aecd534d7d4cb25c3caf58cfd6d45ab8 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -3744,12 +3744,6 @@ gtk_text_view_check_cursor_blink (GtkTextView *text_view)
   return;
 #endif
 
-  if (text_view->layout == NULL)
-    return;
-  
-  if (!text_view->cursor_visible)
-    return;
-
   if (text_view->layout != NULL &&
       text_view->cursor_visible &&
       GTK_WIDGET_HAS_FOCUS (text_view))